From 6c83c38687afb4f443c6c381d8a5a30104ee0731 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Wed, 12 Nov 2003 00:37:02 +0000 Subject: [PATCH] When we are using the old API, make all items "is_important". That way Wed Nov 12 01:29:32 2003 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we are using the old API, make all items "is_important". That way BOTH_HORIZ will continue to show both icon and label in old API mode. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktoolbar.c | 6 ++++++ 6 files changed, 41 insertions(+) diff --git a/ChangeLog b/ChangeLog index fe41dd56a9..1607d0ca20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Nov 12 01:29:32 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we + are using the old API, make all items "is_important". That way + BOTH_HORIZ will continue to show both icon and label in old API + mode. + Mon Nov 10 00:40:41 2003 Matthias Clasen * gtk/gtkeventbox.c (gtk_event_box_set_above_child): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fe41dd56a9..1607d0ca20 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Nov 12 01:29:32 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we + are using the old API, make all items "is_important". That way + BOTH_HORIZ will continue to show both icon and label in old API + mode. + Mon Nov 10 00:40:41 2003 Matthias Clasen * gtk/gtkeventbox.c (gtk_event_box_set_above_child): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fe41dd56a9..1607d0ca20 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Nov 12 01:29:32 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we + are using the old API, make all items "is_important". That way + BOTH_HORIZ will continue to show both icon and label in old API + mode. + Mon Nov 10 00:40:41 2003 Matthias Clasen * gtk/gtkeventbox.c (gtk_event_box_set_above_child): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fe41dd56a9..1607d0ca20 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Nov 12 01:29:32 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we + are using the old API, make all items "is_important". That way + BOTH_HORIZ will continue to show both icon and label in old API + mode. + Mon Nov 10 00:40:41 2003 Matthias Clasen * gtk/gtkeventbox.c (gtk_event_box_set_above_child): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fe41dd56a9..1607d0ca20 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Nov 12 01:29:32 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we + are using the old API, make all items "is_important". That way + BOTH_HORIZ will continue to show both icon and label in old API + mode. + Mon Nov 10 00:40:41 2003 Matthias Clasen * gtk/gtkeventbox.c (gtk_event_box_set_above_child): diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index d30b62cb41..77532815f4 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -3457,6 +3457,12 @@ gtk_toolbar_internal_insert_element (GtkToolbar *toolbar, break; } + /* + * When we are using the old API, consider all items "is_important". That + * way BOTH_HORIZ will continue to show both icon and label in old API mode + */ + gtk_tool_item_set_is_important (item, TRUE); + gtk_widget_show (GTK_WIDGET (item)); if (type == GTK_TOOLBAR_CHILD_BUTTON || -- 2.30.2